Port fix for infomas-asl#23