Updated with bugfix