Fixed applied based on original branch fix 3