This was causing way too many problems