issue #240 returns 2 features. backwards compatibility restablished