[!] BugFix #782, #780
[M]