fix according to brith's concerns, thanks birth kub for insights