The fix josh and rizal implemented