Changed message, fixed minor bug