BugFix #4

Fixed another issue similar to BugFix #3