Fixed. @andreistefanescu please take a look.