Quick dirty fix