LPS 37881 bugfix