Fix for #24
Fix for #21