tnc-ba/strongTNC#27 made changes according to @dbrgns comments