Fix for #18

Fix for #18