Fix #415
Fix #187