Maybe fixed #212?