Attempt to fix #28 again