Fix for #6 

Fix for #6