bugfix 4 of 4