Fix for [ticket:20] and [ticket:86] much thanks to Eevee
4 files changed