Better use of composer pkgs
Small bug fix