added for bug fixes