@maciex006 - fixed part of #1