close #34 - Fixed