#16 added FIXME locating the problem