fixed non mvc code