Fixing a bug and allowing more flexibility.