BugFix: Should create the right bucket for monthly steps