#4 and last little fix for now