@dorkster Have you any idea about this FIXME I've added. Looks like this works ok when testing, but anyway maybe it could be done in more proper way?