Added another FIXME to not to forget to fix hardcoded stuff