Known issue #5 added