Fix for #297 only

Cleanup after review