Issue 281

This should solve #281.