WIP. Attempt to resolve a bug