These changes fix your issue you found