Issue #526 fixing minor bug