#29, fixed issues with backport