Now if should be fixed #803