issue 545 and 1013

appears to not be needed, this fixes the 'flash', i will delete