fixed & closed #2