zomg more fix