Try to fix div_for issue - still buggy