0.9.4 optimisation !!!

Signed-off-by: Blair2004 <carlosjohnsonluv2004@gmail.com>