Ugliest fix ever :/