May fixes #55 and #50