better fix for this