quick fixes again