Fix for #53

Fix for #53