Found a bug. Committing current version in case I need to roll back.