Somefix

Contains fix for #1804