this fixes #1  Recommend this be pulled into core