Interface fix!