quick fix pointed by manstis