Implemented Workaround