Bug Fix for 404