Added FIXME for weird bug workaround