Fixed error from previous commit. Working on key-check.