fixed for bundling into single  file
fixed for bundling into single file