Reverted to working version to fix #175