fix #5 might have to retrofit this one in a 3.4.1?