Re-Fix for 23e9173427686739373d917c944932c3e6422a45