Fixing shlane's bug