fixes #1530

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

Signed-off-by: Suki <suki@missallsunday.com>
Merge pull request #1554 from MissAllSunday/stuff

Stuff