More of a complete hack than a real fix