Fixed issue with key not being set correctly.