fixed clash with new bottle templates