fixed Ahmad's compile errors