fix for issue20