Fixes #468 Fixes #543
Co-authored-by: Josef <sorry.i-keep@it.private> Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>