Address @IdolfHatler's issue from IRC