possible fix from josh