Fixed Bug #3

@B3:R, finally finished this last pesky bug.