[WIP] Fix 0098

#98