Ammendment to #447