fixes #1548
#1549

Signed-off-by: Suki <suki@missallsunday.com>