Fix for passing array or one element