Fix/issue 436

Sorry about the other PR...