Fix issues: https://critic.hoppipolla.co.uk/r/300