1.6.4 work

Signed-off-by: tachyony <tachyony@live.co.uk>