Tries to fix #55