Feature/fix #48

Potential fix for #48