Some bugs were killed and now everything is working as expected