Merge pull request #2143 from matkoniecz/patch-1

ony can be also on