fixed repeating issue