Woop woop fix

@eugene-d please check and merge