Fixed issue with message boxes