[FIXED] #19 closed