Squashing the bug
Important bug squash