fix problems in from helper