Change dynamic key handling, maybe it works now.