addresses #295