comments by Tomas fixed