Workaroung bug