fix one FIXME. This is a rewritten and extended version of a quick patch by Danil Pleshakov and Dimbor.
