Master fix 2

Signed-off-by: Fredrik Axling <fax@ssc.se>