Attempted to fix bug on 83