Fixed to bug in #575