Workaround attempt for issue #6