annual and personal leave payment

Hi Team

I have setup in General Payroll Information as 38 hours work week.  I have some employees working as 36 hours a week.  Effectively I have 2 base hourly work week.

In my entitlements for Annual, Personal and Long Service, I set it to calculate by % based on base hourly worked.  If I am paying Base Hourly of 36 or 38 hours the entitlement accruals works fine, however when I am paying Annual Leave or Personal Leave payment, the base hourly does not accrue these entitlements.

This happen to me for 2 employees on 36 or 38 hours work week respectively, I had to mannualy enter the accruals.  Does anyone have any tip on how to correct this?  It seems to calcuate accruals for payment of these entitlement on the "Hours Worked Weekly" in General Payroll Information setup. 

Many thanks in advance for your help.