[artf779535] bug fixing