Made a "fix" to prevent strange bugs from MySQL