Fixed issue with package declarations