hope this will fix #6