Finally fixed that one bug referenced earlier on