Patch as per #54, #58