Re-fix #245