added quick hack