Workaround attempt II