Fix #3515 This is the right way, thanks for the addition!