lite småfix
 merge