Might help Tom Bodet
#782, needs testing
#782, needs testing