Use fix for binary parser