Minor

Minor optimization;
Minor bugfix;