Added case for multiple features #1567