Possibly fix for issue #533