WIP: better attempt at previous fix