Fix #159

Fix for #159