Cleaned up quick fix