Removed mainBundle check