Attempt to improve command security