Fixes #2663 but needs to wait till issue #2692 is resolved