Trying to fix #236