fixes requested by Jasna & Lucijana