#591 Fixed bug in last commit