second part of fixing #121