Will help unblock #60
Will help unblock #60