FIXED: two tiny bugs
Merge branch 'zlk'