Fix/this please

Fixes ticket:1