Bug fix, all working now