fixes (thanks palexa)