BugFix: subpic in used being override unexpectedly