small changes for safety
