bugfix imported from Lotos v1.0.0
bugfix important from Lotos 1.2.0