fixed a bug, oh another one... oh lock another one...