This MIGHT fix that silliness