Fix #56 - CLOSED