#371 Updated by Mihail comments