Fixing them bugs ;p