#315 Bug Fix, Bug cause by Refactoring