fixed horrible hack