reverted to last working version for cumbia 1.x - branch cumbia-1.5 from commit f04fad6faf818cce5997ed4d830d8d42c7a4e825