BUGS Solved for session