p1.5v1.4.7 - Better stock handling

Signed-off-by: Carlos Escribano Rey <carlos@markhaus.com>