#72 fixed spec & proved functionality works