Fix/524

Fixes issue number 524