Call super and fix