changes to fix bug introduced by packaging