fix @conditional