Issue#63, binary friendly behaviour