Fixed issue #58, for real this time