Commit on the behalf of Ennis Golaszewski