Elevator Fix

-Issue #34 fix