ugly way to fix this