Fix #55 in master