It should fix #665

;)