bug fixes samples