Fixes #511 - Again :-)