Tries to fix #48