[#260] Fix some bullshit