this concludes fix to #334