Fix for https://github.com/rmuller/infomas-asl/issues/17