trying to fix this mess