Fixed #3878

This fixes your issues @bsouster