omgwtfnzbs fix
Merge branch 'bug-fixes'