fixing Barrow's hackjob