Updated to fix issue