Re-fix #152, and test this time