Bug-fix (Artur)