Updated preMount component to work better with A3 1.34