Removed fix #230