April tag goal NaN fix