Fixing Shine compatibility issue