Lapps-74 bugfix