fix for multiple issues