Fix for #234

Fix for #234