This commit would fix #58