fix #1484
fix #1411
Merge pull request #3 from PrinterLUA/master

Fix $1484 and Fix 1411