Another Key related issue fixed