Fixed #18 for new config